build: Specify systemd version requirement

Since we are specifying in the unit files a comment of requiring
systemd >= 246, set the req at buildtime and drop the comment.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2800>

diff --git a/data/org.gnome.Shell@wayland.service.in b/data/org.gnome.Shell@wayland.service.in
index a1980e8a5602af1f846697d161399f48d2420159..813da0b7081dfd4951d88fc7330fa4ee1d144fac 100644 (file)
--- a/data/org.gnome.Shell@wayland.service.in
+++ b/data/org.gnome.Shell@wayland.service.in
@@ -13,7 +13,6 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
-#NOTE: ConditionEnvironment works with systemd >= 246
 ConditionEnvironment=XDG_SESSION_TYPE=%I
 
 [Service]

diff --git a/data/org.gnome.Shell@x11.service.in b/data/org.gnome.Shell@x11.service.in
index e5785b4539dbcbf2c7ed8db330b6b5c3bc78c19d..63a014f14144c0dfb594b040ed8a09c990ddbc21 100644 (file)
--- a/data/org.gnome.Shell@x11.service.in
+++ b/data/org.gnome.Shell@x11.service.in
@@ -13,7 +13,6 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
-#NOTE: ConditionEnvironment works with systemd >= 246
 ConditionEnvironment=XDG_SESSION_TYPE=%I
 
 # Limit startup frequency more than the default

diff --git a/meson.build b/meson.build
index 04b0352e95ea8ebaa720383c96996e10e4a843ac..7bef43514fab9e0c4b730aa8f4b39cc3468a5f0b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -29,6 +29,7 @@ mutter_req = '>= 44.0'
 polkit_req = '>= 0.100'
 schemas_req = '>= 42.beta'
 startup_req = '>= 0.11'
+systemd_req = '>= 246'
 ibus_req = '>= 1.5.19'
 gnome_desktop_req = '>= 40'
 
@@ -102,8 +103,8 @@ else
 endif
 
 if get_option('systemd')
-  libsystemd_dep = dependency('libsystemd')
-  systemd_dep = dependency('systemd')
+  libsystemd_dep = dependency('libsystemd', version: systemd_req)
+  systemd_dep = dependency('systemd', version: systemd_req)
   systemduserunitdir = systemd_dep.get_variable('systemduserunitdir',
     pkgconfig_define: ['prefix', prefix])
   have_systemd = true